bitkeeper revision 1.1159.183.32 (41ab52b3-DjlWJoZ82i2o8psjPO13A)
authorcl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Mon, 29 Nov 2004 16:47:47 +0000 (16:47 +0000)
committercl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Mon, 29 Nov 2004 16:47:47 +0000 (16:47 +0000)
Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into arcadians.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk


Trivial merge